From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 26 Jun 2019 17:51:18 +0000 (+0200)
Subject: extensionDownloader: Use common message dialog layout
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~845^2^2~121
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2f5086efaf90e57245ea200bf9178ca7c5c84cf0;p=gnome-shell.git

extensionDownloader: Use common message dialog layout

While the confirmation dialog for extension installation is simpler
than - say - authentication dialogs, it still makes sense to re-use
the common content layout instead of duplicating it.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/600
---

diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index fdef0b9d2..184db2464 100644
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -3,6 +3,7 @@
 const { Clutter, Gio, GLib, GObject, Soup, St } = imports.gi;
 
 const Config = imports.misc.config;
+const Dialog = imports.ui.dialog;
 const ExtensionUtils = imports.misc.extensionUtils;
 const ExtensionSystem = imports.ui.extensionSystem;
 const FileUtils = imports.misc.fileUtils;
@@ -194,19 +195,14 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
                            default: true
                          }]);
 
-        let message = _("Download and install “%s” from extensions.gnome.org?").format(info.name);
-
-        let box = new St.BoxLayout({ style_class: 'message-dialog-main-layout',
-                                     vertical: false });
-        this.contentLayout.add(box);
-
-        let gicon = new Gio.FileIcon({ file: Gio.File.new_for_uri(REPOSITORY_URL_BASE + info.icon) })
-        let icon = new St.Icon({ gicon: gicon });
-        box.add(icon);
+        let content = new Dialog.MessageDialogContent({
+            title: _("Download and install “%s” from extensions.gnome.org?").format(info.name),
+            icon: new Gio.FileIcon({
+                file: Gio.File.new_for_uri(`${REPOSITORY_URL_BASE}${info.icon}`)
+            })
+        });
 
-        let label = new St.Label({ style_class: 'message-dialog-title headline',
-                                   text: message });
-        box.add(label);
+        this.contentLayout.add(content);
     }
 
     _onCancelButtonPressed(button, event) {